fix vs compilation
Merge remote-tracking branch 'origin/master' into user_events