mattdrayer/api-quality: Quality updates
apply_group_type_filter_1013 merge with master