Resolve #3575584 "Convert claro to"

nicxvanrequested to merge
issue/drupal-3575584:3575584-convert-claro-to into main

Closes #3575584

Merge request reports