Merge branch 'dev'
Updated versions