Add protected_attributes to Gemfile for backwards compatibility
Add protected_attributes to Gemfile for backwards compatibility
Merge remote changes