Merge "Add convenience maintenance script wrapper"