jordanlewis Merge pull request #8886 from jordanlewis/fix-beta-builds …