Merge branch 'tp/huangz_ptv4.1_rev_9_16867' into ibm_next_tmp