Merge pull request #9448 from jflyper/bfdev-g4-adc