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

* commit '161bf05567c2d80e5897e7b415ba43e8f33d8bab':
  Merge pull request #2231 in SMP/jackfruit from feature/JFR-1357-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc