Merge branch 'tp/S1052230' into ibm_next_tmp