RE: Waiver support in HTML report