issue #21385: Backport fix