Added check for authorization.scheme only when authorization header is available
Merge branch 'develop'