Add custom remote method definitions
Merge branch 'master' into feature/rest-api