Merge branch 'date-test-skip' into 'master'