Merge 0.3.7 release into my dev branch