Subgroups were added in #37678 but not properly handled everywhere where PROPERTY_USAGE_GROUP is.
#if!