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

* commit '05f7f752a320c8d2e2fa84c0bfcf34454a722a2c':
  Merge pull request #2237 in SMP/jackfruit from feature/JFR-1395 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc