CRAFTERCMS-214
Improved releasing resources.