Fixxxx
#21707 Done the task.
#21707 Fix
Issue 20708
#21707 Fixed
Merge branch 'i21707'
fix logout was
#21933
Merge branch 'i21933' into development