Update to latest from the coherence-community