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

* commit '74b9f1e3f605a4d6c07b3dcc5b720c0852710ca6':
  Merge pull request #1963 in SMP/jackfruit from feature/JFR-979 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc