Bring in upstream performance improvements

Alex Pottrequested to merge
issue/drupal-3636785:3636785-backport-performance-improvements into main

Closes #3636785

Merge request reports