Resolve #3239136 "Refactor when"

Ahsan Nazirrequested to merge
issue/drupal-3239136:3239136-refactor-when into 11.x

Closes #3239136

Merge request reports