Updating my branch

Syncing my branch with the most recent mainline code