Merge branch 'tp/ibm_next_S1049187' into ibm_next_tmp