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

* commit 'b2ce73fe9a378faf2a4e5990c71e491f0334f08f':
  Merge pull request #1400 in SMP/jackfruit from feature/SMP-9326-fix1 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc