Merge branch 'release/4.7.0'

3 jobs for master in 11 minutes and 21 seconds (queued for 4 minutes and 30 seconds)