Merge branch 'release/4.6.0' into develop