Merge pull request #1042 from david22swan/GH-1038/main/check_valid_until