Merge branch 'release/8.5.1' into production
Improvements to event template
Remove event groups
Remove user groups
Bump version number
Merge branch 'release/8.6.0' into production
Merge tag '8.6.0'

Release 8.6.0