Merge branch 'hotfix/4.0.1'

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