Rebase on Upstream

This issue is a meta issue to track questions related with rebasing our current codebases back on Upstream.

Related upstream issues are:

Edited by Jon Richter