Import vanilla 2.3.9.7.
Merge tag 'v2.3.9.7' into general-fixes

Vanilla 2.3.9.7.
Merge branch 'general-fixes' into ray