Merge "Fixing up the formatting code which is already merged"