Merge change I824f0fc9

* changes:
  Adding support for plugins.