Merge branch 'fix_critical_issues' into 'master'

fix

See merge request !178
1 job for master in 8 seconds (queued for 3 seconds)