Merge branch 'tp/ibm_next_pt_fix_log' into ibm_next_pt_tmp