#3555720 query performance

Alex Pottrequested to merge
issue/drupal-3555720:3555720-11.2.x into 11.2.x

(cherry picked from commit 5a125053)

Closes #3555720

Merge request reports