issue #22394: write context queries directly against underlying table
Merge branch '22394' into 22394-merge
issue #22394: don't check for version 4.3
issue #22394: account for cases where relations are defined in orm extensions
Merge branch '22394' into 22394-merge
Merge branch 'ndtest' into 22394-merge
fix nondeterminism of return
Merge pull request #1195 from shackbarth/22394-merge

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