Merge pull request #9439 from jflyper/bfdev-g4-softserial