issue #22394: bring in context patch, and fix database to 4.2.1

There is a pull request in private-extensions that must also be pulled in at the same time!