Merge branch 'release-1.0.6'

6 jobs for hotfix-1.0.6.a in 6 minutes and 59 seconds