Merge pull request #9407 from jflyper/bfdev-g4-uart