Merge pull request #9548 from jflyper/bfdev-g4-i2c