CR-1207: Merge CP-4498 into Clearwater