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

* commit 'd188a2404097734ac90b27b816a39ed605572ab7':
  Merge pull request #1815 in SMP/jackfruit from feature/JFR-678-fix-gateway to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc