Merge "Move plugin definition to plugin library"