sync with last release version of 2.10