CLEARWATER: Second wave of commits for PR-1589