restoring other date areas, fixes #7453
Merge branch 'dev' into test