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

* commit 'a48a1d055b0b4b2e988f7bff2f8d6a96608041ae':
  Merge pull request #2117 in SMP/jackfruit from feature/JFR-1169 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc