Merge "Update Gemfile configuration"