[R-7923] in N6.0.5: Global bypass now works correctly

R-7923 PROJECT: Global bypass now works correctly.