Merge branch 'hotfix/fix-formatting' into develop
Merge branch 'hotfix/fix-formatting-issue' into develop
new formatting fix
Merge branch 'release/1.1'