Merge pull request #9348 from jflyper/bfdev-g4