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