Merge branch 'develop' into 'fix/group-offer-type-readonly'

# Conflicts:
#   test/system/group_offers_test.rb
2 jobs for fix/group-offer-type-readonly in 28 minutes and 21 seconds (queued for 26 seconds)