Merge branch 'ptp-adjfine'