Upstream sync

Attempt to sync with upstream.