Merge branch 'pending-dma-coherent' into devel