Merge branch 'tp/ibm_next_S1042805_1' into ibm_next_tmp