Merge "Move plugin support to shared lib"