CI-859

[Consolidated with CI-857]