Resolve #3522361 "Finish conversion of"

nicxvanrequested to merge
issue/drupal-3522361:3522361-finish-conversion-of into 11.x

Closes #3522361

Merge request reports