Resolve #3485896 "Nicxvan order at call time"

nicxvanrequested to merge
issue/drupal-3485896:3485896-nicxvan-order-at-call-time into 11.x

Closes #3485896

Merge request reports