Merge "Update cookbook plugin to latest revision"