Rest feature compatibility

thanks for another nice clean targeted PR!

We are currently in a feature freeze for the 6.0 release, I have added both your PRs to the 6.1 sprint.

One little thing, please add the PR link as a comment on the issue once you have created it