Merge branch 'common/clkfwk' into sh-latest