Merge branch 'hotfix/2.5.7'
Version bump
Merge branch 'hotfix/2.5.8' into develop