Issue #ATDMDC-7