Merge branch 'tp/pull-request' into ibm_next_20_tmp