Merge "Update formatting in maintenance/ (2/4)"