Merge branch 'tp/ibm_next_recv_S1047695' into ibm_next_tmp