Updated Version
Merge branch 'feature-events' into develop-products