Sync with 0.9.0 release