S#10387 - Rework pluginlib actions