Merge branch 'formatting-fixes' into 'develop'