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

* commit 'e0c3d85047f6630b455f2390162ac234458ed3e5':
  Merge pull request #1533 in SMP/jackfruit from feature/SMP-9652-bug to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc