Merge "Move plugin definition to plugin library" into tm-qpr-dev