Merge branch 'hotfix/2.2.12' into develop
Uploads bugfix
Merge branch 'develop' into hotfix/2.2.13
Merge branch 'hotfix/2.2.13'