Merge pull request #3656 from marek-safar/bootstrap