Merge branch 'tp/ptfixes' into ibm_next_20_tmp
Merge branch 'tp/up-ops' into ibm_next_20_tmp