Upstream merge
1.7.6-pre1 support