Pull in Upstream Changes

Gradually vetting...