Merge pull request #8524 from ferjm/bug843309

Bug 843309 - paymentSuccess sometimes does not appear in scope (payment ...(cherry picked from commit f815f9271dde55dcf71d33d87149a8e4538cf09b)