Merge branch 'tp/ibm_next_S1056749' into ibm_next_tmp