Merge branch 'tp/acl_S1051728' into ibm_next_tmp
Merge branch 'tp/S1051779' into ibm_next_tmp