upstream version 2.10