Merge branch 'hotfix/fixedBrokenRest' into develop
Merge branch 'develop'