Merge branch 'clksrc/cleanup' into next/multiplatform