Merge branch 'develop'
Merge branch 'develop'
Merge branch 'releasecandidate/Alpha-2'
fixed another auth-related bug