Merge pull request #7540 from jflyper/bfdev-vtx-table-tramp