merge 2.5-compatibility version into master