CMS-1331 Make CreateContentHandler detect content to embed