Sync with coherence-community project