Resolve #2957368 "Convert patch 50"

solideogloriarequested to merge
issue/drupal-2957368:2957368-convert-patch-50 into main

Closes #2957368

Merge request reports