DMOC-11639

DMOC-11639