CRAFTERCMS-846 & CRAFTERCMS-842