Resolve #3359322 "Fix the various"

quietonerequested to merge
issue/drupal-3359322:3359322-fix-the-various into main

Closes #3359322

Merge request reports