Merge Issue #22558.