Rest controller update.
Merge branch 'master' into initial