Release 2.38.5.
Fix cleanup.
Merge branch 'master' into you
more breakage