Issue #19489: Merge with 3.5