Got some feedback on my PR that ports a servicing fix: https://github.com/dotnet/runtime/pull/87534 Will address separately.