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

* commit '1b283c6e35f4645df03bad059c767feb16751f39':
  Merge pull request #1631 in SMP/jackfruit from feature/SMP-9392-fix-3 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc