CLEARWATER: CA-94829 clearwater

This pull request is a combination of PR#974 and PR#989 - the latter depended upon the former.