Hotline#17968 cms dates

Laurent requested to merge hotline#17968_cms_dates into master

Merge request reports