99fb776ace
Fix another manual_unwrap_or deref FP changelog: none (since this just piggybacks on #7233) Fixes #6960