feat(model/view): enables multiple types to be selected
Merge remote-tracking branch 'origin/develop' into develop