CB-4595: updated version
Merge branch 'master' into dev