Merge "Fix a format issue" into main