Merge branch 'fix/prune-hashtags' into 'develop'