Commit to allow nms addition to be on a separate commit.
Import MerchantRecipe from mc-dev for diff visibility.