Block a user
Backport patch from upstream BZ #32470
Backport patch from upstream bz #32470
WIP: [a8] Backport upstream patch to fix distro detection
Sync to c9 and backport upstream patch to fix distro detection