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

* commit 'a64343cb147f4648fe1813c7c0188bd93bd8a324':
  Merge pull request #2098 in SMP/jackfruit from feature/JFR-940 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc