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

* commit 'e5500e9d6c853dc92d20ec87dfee5081ecaa4896':
  Merge pull request #2328 in SMP/jackfruit from feature/JFR-1525 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc