Merge branch 'sh/driver-core' into sh/clkfwk