decouple entityResource from the function call
Merge branch 'develop'
Add enable deep requests