Re-rolled patch #8, for drupal9.4. Attached interdiff for same.