merge 0.9.39 fixes