Fixes to follow EPiServer CMS 7.5