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

* commit '1b6b15c5d598ca88038446fe0bac355450cf0209':
  Merge pull request #2374 in SMP/jackfruit from feature/JFR-1534-fix-3 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc