CMS-1185 Let Data of type ContentReference take be a ContentId instead of String