upstream version 2.8.0