Merge branch 'tp/S1046213' into ibm_next_tmp
Merge branch 'tp/S1043352_lwr' into ibm_next_tmp