Fix up TAJVM for TANAL 9b7a18c
Patch to use the ctx hierarchy
Merge remote-tracking branch 'origin/feature/expression-context'