am 856df43c: Merge "MAP 1.1 Review fixes" into klp-dev

* commit '856df43c064bea26e467e2305791ce022fe4cf6e':
  MAP 1.1 Review fixes