Merge branch 'tp/0927_fix' into ibm_next_2Xmerge_tmp