Support for dev versioning scheme.
Merge branch 'feature/new-versioning-scheme' into develop