Merge branch 'tp/S1052101' into ibm_next_tmp