Fixes for 11.x.

godotislaterequested to merge
issue/drupal-3607938:3607938-11.x into 11.x

Closes #3607938

Merge request reports