Merge pull request #4219 from marek-safar/corert-bump