Merge branch 'tp/CID30206' into ibm_next_20_tmp