Move oxql
from oxdb
to mainline omdb
#5988
+879
−469
Merged