Upstream integration

Pulled some updates by @msmathers