Nive's commit
Merge branch 'release-nive_version' into dev