Merge "Fix plugin loading"