Merge to head in amplab/shark