Code formatting.
Merge branch 'code-formatting' into develop