v2.5.7
Merge branch 'release/2.5.7' into production
Merge tag 'v2.5.7'

v2.5.7