Merge branch 'release/4.0.6'
Merge tag 'v4.0.6' into develop

4.0.6 v4.0.6