CRDT-1498

CRDT-1498