sync with 0.8.5