Fixed broken REST.
Merge branch 'hotfix/fixedBrokenRest'