Merge branch 'clk-ti' into clk-next