Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev