Updated versions
Merge branch 'hotfix/update-versions'
Merge branch 'master' into develop