Merge pull request #2521 from TheBlueMatt/2023-08-one-less-write