Merge branch 'clk-parent-rewrite-1' into clk-next