Merge branch 'fix_critical_issues' into 'master'

fixing imports

See merge request !176
1 job for master in 11 seconds (queued for 2 seconds)