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

* commit '397fa70e425998f84d8466991398faece6fb387d':
  Merge pull request #1472 in SMP/jackfruit from feature/SMP-8989-staging to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc