CMS-3007 Support for inserting part and layout - partial + bugfix