Merge branch 'ptp-adjfreq-copnvert'