Merge "Update the VFC NS resource recipe"