Fix upstream merge