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

* commit 'b6d1d314798e69046b0eaaae9165e306afb2f30b':
  Merge pull request #1691 in SMP/jackfruit from feature/JFR-626 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc