Merge "Update cookbook-plugin"