[#31955] Two factor authentication is broken in the back-end (Fix #1939)
[#31950] Hathor: twofactorauth (user manager) (Fix #1935)
Merge remote-tracking branch 'remotes/upstream/master' into jux-rebased