Merge pull request #2612 from TheBlueMatt/2023-09-namespace-split