Optimize joins

Patrick Kennyrequested to merge
issue/drupal-2875033:optimize_joins into main

convert patch #48 to MR

Merge request reports