Merge "Minor TAG update in PluginActionManager" into tm-qpr-dev