Merge branch 'tp/idmapper_fix_v2' into ibm_next_tmp