Merge branch 'branch-2.5'