Restore functionality with test coverage

Adam G-Hrequested to merge
issue/drupal-3464550:3464550-10.4.x-tests into 10.4.x

Closes #3464550

Merge request reports