Merge branch 'v2.5.x'