Merge pull request #1887 from TheBlueMatt/2022-11-definitely-valid