merge from 2.6 branch