Merge "Newly create idmap only when it is outdated" into oc-dev