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

* commit '17b4d5a361194c055f780c50a493d037d12070bb':
  Merge pull request #2339 in SMP/jackfruit from feature/JFR-1542 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc