Added authorization.
Merge branch 'origin/os-optima'