Merge branch 'release/4.9.0' into develop