CEL-6618

CEL-6618