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

* commit '83f683cae5f2950effbf191b7416c969365fee36':
  Merge pull request #2313 in SMP/jackfruit from feature/JFR-1135-stg to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc