merge from trunk 10727:10728