Sync with coherence-community