Automatic merge from release/2-sandbox -> development
Automatic merge from release/2-sandbox -> development

* commit 'f1f60688c13885065f0e18d009e3cae8f8e8d68a':
  Merge pull request #2037 in SMP/jackfruit from feature/JFR-1005-fix-refund5 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc