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

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