JC-1513 Initial plugin discovery
JC-1513 Initial plugin discovery
Merge remote-tracking branch 'origin/master' into JC-1498