Merge branch 'base_admin' into 'dev'

Base admin

See merge request federez/re2o!417
1 job for dev in 3 minutes and 10 seconds (queued for 1 second)
Status Job ID Name Coverage
  Lint
passed #1847
lint

00:03:10