[ci skip] Manually apply PR #3461

I would've merged it earlier, but that would cause conflicts when feature/session
is merged.
3 files changed