Merge pull request #23537 from janvorli/remove-gc-cpu-group-knowledge