sync with ca_crkc production