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

* commit 'c6c6eb1ff84d64b90299787bd4af935b7dac8b64':
  MAP 1.1 Review fixes