Merge branch 'common/dma' into sh-latest