Merge branch 'tp/huangz_PT_QC20252' into ibm_next_pt_tmp
Merge branch 'tp/remove_log_rotate' into ibm_next_pt_tmp