CMS-924 Mixins are not saved on update