CRAFTERCMS-21 resolution