Merge pull request #24066 from janvorli/put-back-cpu-limits