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

* commit '6d7845f5fea9ac71d8cc30ed5129a96e67fba1cd':
  Merge pull request #2169 in SMP/jackfruit from feature/JFR-1322 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc