Issue #12885: Merge with 3.5