Merge branch 'qa' into 'master'

Fix multiple bugs and code smells

See merge request !147
7 jobs for master
in 2 minutes and 47 seconds and was queued for 1 second