Sync with 0.2.0-SNAPSHOT