Resolve #3416522 "10.1.x"

Alex Pottrequested to merge
issue/drupal-3416522:3416522-10.1.x into 10.1.x

First effort at #3416522 on 10.1.x because that is where I have the sites.

Merge request reports