merge from 2.5.0