Fix for missing param.
Fix: Not using correct vars names
Merge remote-tracking branch 'origin/3.5' into 3.5_backported