Redo auto-formatting
Merge branch 'feature-formatting' into develop
Merge branch 'develop'