Issue #24802: Merge null termination fixes from 3.4 into 3.5