Merge branch 'release/3.10.0' into develop