Update to 2.5
Merge branch 'hotfix/2.5'