dotCMS/core#6748 #32