ACCUMULO-1798 WIP