Changes to support immediate payment

Merged Santiago Said requested to merge SupportImmediatePayment into 8.0-stage

Merge request reports