Merge branch 'release/4.8.0' into develop