Merge remote-tracking branch 'slave-dma/next'