Merge "Fixing comment formatting" into main