Merge pull request #9490 from jflyper/bfdev-fix-overlooked-case-from-unified-dma...