Merge branch 'release/2.5.7'
Merge branch 'master' into develop