Use a better version handler.
Merge remote-tracking branch 'refs/remotes/ivan/feature/better-version-handling' into develop