Merged with auth-branch
Merged with authorization branch