Merge branch 'clk-next-mmp' into clk-next