Fix spec error
Fix authorization error for user
Merge develop into master