Bugfix. Variable shadowing.
Merge branch 'development' into settings-jobs-design