Merge branch 'bugfix/waldo_logout_view'