Finalize merge paddle_events branch + master