Cc1

Merge master and cc1.