Merge branch 'tp/ibm_next_S1046876' into ibm_next_tmp