Merge commit 'kumar/kumar-dma'