Apply patch from 3301623-add-olivero-like-primary

Andrew Mortonrequested to merge
issue/drupal-3301623:3301623-add-olivero-like-primary_11.x into main

Closes #3301623

Merge request reports