Draft: [2957368] 2957368 patch 50 to MR

Dexie Amanterequested to merge
2957368-convert-patch-50 into 11.x

Tested patch #50 locally, and just converting this patch for review.

However changes added in #50 is dependent on project/drupal!2680

Edited by Dexie Amante

Merge request reports