upstream version 2.8