Merge branch 'cross-platform/clkdev' into next/cross-platform