fix logout
Merge branch 'release/fix_logout'