Fixes CRAFTERCMS-640,CRAFTERCMS-641