Merge branch 'tp/ptfixes' into ibm_next_20_tmp