Merge branch 'hotfix/2.5.1'
Merge branch 'release/2.5.2'
Merge branch 'release/2.5.3'
Version bump
Fix typo
Update CHANGELOG
Merge branch 'hotfix/2.5.4' into develop