Add Fixes for No Signed in User
Merge master into hotfix
Merge branch 'hotfix'