version reset.
Merge branch 'feature-versionreset' into dev