Merge "Work around buggy DMAgent." into nyc-dev