Fixed upstream merge