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

* commit '1180121c3cc6679d1c3f0cc887fea7622986e9fb':
  Merge pull request #2023 in SMP/jackfruit from feature/JFR-1024-fix2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc