Card #48 added group by type
Merge remote-tracking branch 'origin/develop' into develop