fixes
eng comments plugins
Merge branch 'dev'