Merge "Fix ktlint errors" into main