Fixed DDC-1884.
CS fixes.
Merge branch 'DDC-2582' into 2.3