Merge branch 'hotfix/4.0.6-1'
fix
Merge branch 'hotfix/4.0.6-2' into develop