Merge "Update cookbook plugin to latest version"