latest upstream
sync with upstream.
sync with upstream while keeping things working.
sync with upstream.
resync again.