Merge remote-tracking branch 'origin/exception_namespace' into ratelimit_exception_namespace
Merge remote-tracking branch 'origin/ratelimit_exception_namespace'