Merge branch 'tp/S1051752' into ibm_next_tmp