Merge branch 'tp/S1051752' into ibm_next_tmp
Merge branch 'tp/ibm_next_jv_S1050077' into ibm_next_tmp