Issue #21869:incorporate patch