ACCUMULO-2641 WIP