Merge branch 'develop-envir' into 'master'

Undo environment fun

See merge request !26
1 job for master in 50 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Build
passed #13645
build

00:00:50

87.19%