Merge "Apply cosmetic changes" into main