Merge pull request #15846 from greenpeace-cee/fix-cancel-date