1.7.10 Upstream merge