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

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

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc