Adapt to the new local client events changes. Fixes #3214.
Merge pull request #3237 from s0undt3ch/issues/3214

Adapt to the new local client events changes. Fixes #3214.