Sync with Grizzly branch for n1k plugin. Use VSM build 305+.