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

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

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc