Fix a transient bug in authorization
Merge branch 'authorization_fix'

* authorization_fix:
  Fix a transient bug in authorization