Merge branch 'sh/intc-extension'