Issue #27960: Merge with 3.5