Issue #27200: Merge with 3.5