RIPTIDE-11482

RIPTIDE-11482