Merge branch 'clk-parent-rewrite' (early part) into clk-next