Merge branch 'div6-clk-for-3.19' into base