Merge branch 'mfa_fix' into 'develop'

mfa fix

See merge request !1036
4 jobs for develop in 4 minutes and 22 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Lint
passed #86695
lint

00:00:50

 
  Build
passed #86696
build

00:01:19

 
  Test
passed #86697
test

00:01:54

 
  Deploy
passed #86698
docs-deploy

00:00:17