Merge branch 'release/0.4.7' into master

8 jobs for master in 3 minutes and 48 seconds (queued for 1 second)