Merge branch 'fix_critical_issues' into 'master'

fixing typescript import

See merge request !175
1 job for master in 12 seconds (queued for 2 seconds)