Merge branch 'tp/S1053805' into ibm_next_tmp