CRAFTERCMS-435: Error improvement management
Merge remote-tracking branch 'alvaro/master'