Merge branch 'release/5.9.0' into develop