backport event namespace fix.