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

* commit 'dd7d0965416e8b2335f119348b7c0f90e7320492':
  Merge pull request #1378 in SMP/jackfruit from feature/SMP-9477 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc