Logic is the same, just now ported, while this feature was being
improved anyway in this branch.

Resolves #20961