ACCUMULO-2589 WIP