Merge pull request #4614 from saurabh6790/cart_fixes

[fixes] redirect uri fixes