Merge branch 'release/4.0.5'
Merge tag 'v4.0.5' into develop

4.0.5 v4.0.5