Merge branch 'tp/S1048309_2.0' into ibm_next_20_tmp