Solves CRAFTERCMS-809