re #679 - Typo
Merge branch 'feature/679-analytics' into staging