dotCMS/core#6494: Implementing also in 2.5.7