Pull Requests from main repo

Merge in pull requests from main repo