Merge branch 'dev' into 'master'

Fix type and variable naming

See merge request !1
2 jobs for master in 1 minute and 24 seconds (queued for 1 second)
latest