Merge branch 'tp/clientid_fix_S1051571' into ibm_next_tmp
Merge branch 'tp/ibm_next_S1053475' into ibm_next_tmp