Merging commits from master branch into type-providers