merging from master, commenting out haileys tests (no data)