Import upstream version 1.7.7