Merge "Convert Maintenance to the new shell framework"