Merge branch 'tp/S1046468' into ibm_next_tmp