Merge pull request #3425 from jflyper/bfdev-spi-minor-fix