Backport #7571 to 1.66 once merged

[arvindbr8]

PR #7571 resolves a bug that was introduced in version 1.66. We need to apply this patch and release a new version to fix the issue. This issue is used to track the progress of patching and releasing the fix.

[coxley]

@arvindbr8: Any idea when we can get this patched in? :)

[arjan-bal]

Closed via #7616
The fix is part of version 1.66.2.