Merge branch 'cppcheck_fixes' into 'master'

Cppcheck fixes via gitlab



See merge request !60
7 jobs for master