Merge pull request #311648 from r-ryantm/auto-update/flix