Merge remote-tracking branch 'drebs-github/bug/3515_events-server-test-fails' into...