Merged with cldc-branch