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