Import upstream version 2.1.1
Import upstream version 2.1.2