Return proper ObjectContent objects in RetrieveResult
Merge branch 'develop'