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

* commit 'cb329ad260d06bcb6c9d84463e676a9fb4ebbe7e':
  Merge pull request #1667 in SMP/jackfruit from feature/JFR-551 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc