Group by
Merge remote-tracking branch 'origin/Locations-CRUD' into Sprint-2