Merge branch 'feature/shut-up-compiler-warnings' into 'master'
get rid of unused/shadowed variable compiler warnings.
See merge request !981 (merged)
(cherry picked from commit 8b107865)
0d862660 get rid of unused/shadowed variable compiler warnings.