Merge "Fix @covers tag"