merged from 2.10