Upstream merge 2: Upstream merge harder