CLEARWATER: PR-1455

Dup of #1210 for clearwater.