JC-1497 Fixed pluginLoader usage.
Merge remote-tracking branch 'origin/master'