More CA changes #10353