Merge "Reformat file before making actual functional change" into main