Updates for CA-122017