Import upstream version 2.6.1
Import upstream version 2.7