Merge branch 'fix_critical_issues' into 'master'

changing uuid entry

See merge request !174
1 job for master in 11 seconds (queued for 1 second)