re #679 - Always symlink key back in
Merge branch 'feature/679-analytics' into staging