Fix issue #24635.
3 files changed