Bugfix missing service vars
Merge remote branch 'params/master' into merge_testing