intergreate comments plugin
Merge branch 'develop' into Allen_Branch
bugfix create fir
Merge branch 'Allen_Branch' into develop