Merge "Always delete old idmap in createIdmap" into sc-dev