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

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

Version 2.3.9.5.
Change 2.3.9.3 -> 2.3.9.x from Makefile.