I think the attached patch should fix the issue with --no-events, but I haven't tested it. Could you test?
I think the attached patch should fix the issue with --no-events, but I haven't tested it. Could you test?