[#11630] Fixed DCS problems.