Issue #23804: Merge SSL zero read fix from 3.5