Closes #2998728
Re-roll the patch into Mr For Drupal 11.x dev .
added 1 commit
Compare with previous version