Rerolled the 9.x changes for 11.x and added a test

David Cameronrequested to merge
issue/drupal-2896169:2896169-details-description-D11 into 11.x

Closes #2896169

Merge request reports