Contextualising resource parameters.
Merge branch 'develop' into feature/frontend