Merge branch '2558-two-factor-authentication' into 'develop'

Resolve "Two-factor authentication"

Closes #2558

See merge request !1575