Add compatibility for wire 0.9-0.10 plugin architecture
Merge master
Fix wire 0.9 plugin support