Pull in new changes from CCL