Merge branch 'gem_update'