upstream version 7.1.1