038 patch

merge 0.3.8.2 patch fixes -> dev