*8445* Implement embedded content import; reference cleanup