Merge "Fix format errors" into main