CRAFTERCMS-97 and CRAFTERCMS-93: Managing those issues.