commit2 for branch 25