Upstream merge@!