sync with 0.5.0-1.6