Merge branch 'ptp-warnings'