Merge "Reformat to avoid upload issues when making future changes" into main