Merge branch 'master' into sh/clkfwk