Merge branch 'for-5.5/clk-core' into for-5.5/clk