Sync with v0.5.1