merge from 3.1 for issue issue12261.