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

Closes #3301623

Merge request reports

Loading