Merge branch 'hotfix/4.0.4'
Merge branch 'release/4.0.5'
Version update
Merge branch 'master' into develop