BZ-9741 added more diags