UI-3271: Incorrect for my wiki in user menu
Merge commit '7a2cd88ecc57ca9b5a3780297b38e258fd522af4' into HEAD
Merge commit 'b5c817d94c88731c2a0cf529c89bb6dad7b686e4' into HEAD