Merge branch 'cpuclock-test'