Merge branch '2848-fix-unban-picking-the-first-matrix-user' into 'develop'