Merge pull request #2235 from TheBlueMatt/2023-04-criterion