Pulled in modifications from CCL
Merge master