Merge "Fix LocalUpdatableMaps"