Merge branch 'instance-fixes' into 'DEV'

Instance fixes

See merge request !22
2 jobs from DEV in 1 minute 31 seconds (queued for 14 seconds)
Status Job ID Name Coverage
  Test
passed #1679
flake8

00:19

passed #1680
test

01:12