DAR-2560

**DO NOT MERGE**
We're going to code review it and test it.