DCOW-7359:24