Merge "Add one-shot plugin support"