Commit of code compatible with dotCMS 1.7