CRAFTERCMS-842 & CRAFTERCMS-846