merging #2077
Merge remote-tracking branch 'origin/hashtalk' into notifications-refactor