Merge "Improve CC handling for immune objects"