fix bug: fix mention bug
Merge branch 'development'