fix events blocks
Merge remote-tracking branch 'origin/develop-theme' into sprint-5
Merge branch 'sprint-5' into develop