Merge branch 'tp/S1048195_ibm_next' into ibm_next_tmp