Rerolled patch from DO-2833968-74 for 11.x.
Compare changes
+ 32
− 0
@@ -549,6 +549,9 @@
@@ -961,6 +964,35 @@
https://www.drupal.org/project/drupal/issues/2833968
Rerolled for 11.x
the patch from: https://www.drupal.org/project/drupal/issues/2833968#comment-15658953