Resolve #3564689 "Combine all"

catchrequested to merge
issue/drupal-3564689:3564689-combine-all into main

Closes #3564689

Merge request reports