Update gems
Merge branch 'feature/update_gems' into develop