Merge "Update the cookbook plugin"