Merge branch 'tp/fix_checkconfgv2' into ibm_next_2Xmerge_tmp