sync with 0.9.8 branch