Issue #24802: Merge null termination fixes from 3.5