Merge branch 'tp/S1046987' into ibm_next_tmp