fix
Merge branch 'hotfix/4.0.6-2'