merge D2 druntime pull #381