Merge branch 'fix_critical_issues' into 'master'

fix import

See merge request !179
1 job for master in 7 seconds (queued for 2 seconds)