CCL to v1.11 and API21 fixes