Merge branch 'accept-embedded-announce-object' into 'develop'