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

* commit 'd1b6296c2e0200841cf74603ca8c0a3507e1300f':
  Merge pull request #1308 in SMP/jackfruit from feature/SMP-9113 to release/0-blue

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc