Merge branch 'release/4.0.6' into develop
Fix unique
Update version
Merge branch 'release/4.0.7'