Merge branch 'clkdev' into fixes