Merge branch 'hotfix/fix-formatting'
ok take 2
Merge branch 'hotfix/fix-formatting-issue' into develop