Merge "MAP 1.1 Review fixes" into klp-dev