Merge "Fix formatting" into main