case 2535 fix - Empty space fixed.
case 2535 - Removing unneeded variables that cause error.
Merge remote-tracking branch 'origin/case-2535-fix' into hotfix
Merge branch 'hotfix' into develop