[WPB-3664] Port changes from develop to mandarin#3591

mdimjasevic merged 1 commit intomandarinwireapp/wire-server:mandarinfrom

wpb-3664/cherry-pick-from-develop-to-mandarinwireapp/wire-server:wpb-3664/cherry-pick-from-develop-to-mandarinCopy head branch name to clipboard