Upstream merge: 1.7.9