JC-1513 plugin state management
Merge remote-tracking branch 'origin/master'