Clearwater - CA-107919: Reduce memory footprint of RRDD