Merge branch 'clk-dove' into clk-next