Issue #20374: merge