Updated to new AAE code, fixed some crdt related things.
Merge branch 'test' into dev