sync with latest 0.6