Merge branch 'dma' into devel