Clean up indentation.
Merge branch 'develop' into 579-rework_header