7467:move Image and TextContentManager