merge from branch 25