Merge "Change of versioning strategy"