merge 0.8.4 into master