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