Merge branch 'bugfix/formatting' into 'develop'