Merge "ktfmt some files" into main