Merge "Fix dangling pointer issue in LocalUpdatbleMaps"