Merge branch 'tp/remove_log_rotate' into ibm_next_pt_tmp