issue #23241: unify data in source-built databases

- Also resolves #23242 
- Good luck with the code review!
- There's a pull in private-extensions but it won't pass until this one is pulled in