Merge "Fix plugin reloading" into oc-dev