Rerolled changes from patch #151 for 11.x branch.

Mrinalini Kumarirequested to merge
issue/drupal-2652000:2652000-views-do-not into main

Merge request reports