Added more checks to perf plugins.
Merge branch 'test' into dev