Merge Update

Imports updates from the git pull from upstream