Added the fix from feature
Merge pull request #2685 from ten24/hotfix-ds-orderReturnFix

Added the fix from feature