Import vanilla 2.3.9.5.
Merge tag 'v2.3.9.5' into general-fixes

Vanilla 2.3.9.5.