Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search...