4.0.5 version
Merge branch 'hotfix/4.0.5'