Issue #24603: Merge with 3.5