merged from 2.10 branch