Update gems
bump version
Merge
Service optimization