Still checking for the versioning and how it affects the master

Change-Id: I88f237a5f7614630cbe86696676df1991de6e010