Merge pull request from dshukertjr/fix/mention fix: mentions will load people in the comments first