reintroduced all functionality for authentication and authorization
Merge origin/master