Merge "Add coverage support"