Merge branch 'tp/rev_3' into ibm_next_pt_tmp