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

* commit '5c97787a970a241a904a34f4cc5959f975711233':
  Merge pull request #1653 in SMP/jackfruit from feature/SMP-8778-revert to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc