Fix a GroupView crash that was triggered by the FTB tracking
Merge branch 'develop' into feature_version_json_butchery
More refactor.