Missed one reference during a var rename
Merge branch 'develop' into additional-groupings
Small improvement to avoid duplication
Bug fix in _enabledTypes
Merge branch 'develop' into additional-groupings