Merging Upstream changes to clean up the pull request