Allow returning by composed resource reference

- Allow returning the composed resource by reference.
Merge branch 'hotfix/resource-reference'

Allow returning composed resource by reference.