Merge branch 'tp/clientid_fix_S1051571' into ibm_next_tmp