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

* commit '94bd49784d248745a2f4e12fd898877a6fed188b':
  Merge pull request #2385 in SMP/jackfruit from feature/JFR-1360 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc