Merge branch 'embedded-object-federation' into 'develop'