uptream pull

Pulling in latest changes from upstream.