Commit cctools changes.
Fix merge conflict.