Merge branch 'fix_critical_issues' into 'master'

skip lib check

See merge request !177
1 job for master in 8 seconds (queued for 2 seconds)