CLEARWATER:CI-44

Must pull together with some changes in other repository! Please see the comment for instruction.