Merge pull request #2577 from TheBlueMatt/2023-09-msrv