Merge branch 'release/5.7.0'