CMS-3292 Refactor BaseAbstractContent