Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest