am abdaa32d: Merge "Fix bug in passing of context flags and version."

* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.