Merge pull request #11776 from blckmn/automated_build