Merge branch 'tp/jbongio_ibm_next_pt_log_4.1' into ibm_next_ptv4.1_tmp