Merge branch 'tp/ibm_next_S1043167' into ibm_next_tmp