Merge pull request #13815 from radical/nuget-5