Merge branch 'tp/remove_log_rotate_v2' into ibm_next_pt_tmp
Merge branch 'tp/hincheuk_81023782_v2' into ibm_next_pt_tmp