Merge branch '2.5'