Merge in maintenance tool (again)