Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev