Update versioning

Fix: MN-2631
Ref: OS-90

Change-Id: I36d51b3f5784db582fe1f7ccc1a32765b3dd4e6a
Merge "Update versioning"