Issue #24746:avoid duplicates