Merge branch 'release/5.8.0' into develop