Rollback version
Build update
Merge branch 'dev'