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