Fix #7 (CP): An attempt to resolve dts/pts wrap issue.
Merge branch 'build-cp-vcexpress' into build-cp