Merge commit 'f17a0dd1c2e0' into clk-next