Cherry pick command

More discussion about testing vs. production etc.