Merge branch '1447-date-tests-again' into 'master'