Merge branch 'tp/ibm_next_20_minorfix' into ibm_next_2Xmerge_tmp