plugins fix, partial suite instance modal
Merge branch 'master' into gh-pages