version fixed (CB-6718)
Merge branch 'fix_version'