Merge branch 'tp/ibm_next_wcc_S1042851' into ibm_next_tmp