Resolve #3483599 "Conversion4"

nicxvanrequested to merge
issue/drupal-3483599:3483599-conversion4 into 11.x

Closes #3483599

Merge request reports