Merge branch 'clks' into devel