Merge branch 'common/intc-extension' into sh-latest