refine number of events to be with MP timeframe
Fix merge conflict; update .env-dist
Merge branch 'fuzzyfox-bug1040743' into develop