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

* commit 'bb88c0eb10f4e4474b16b216b4f9cd429cf9fad3':
  Merge pull request #2320 in SMP/jackfruit from feature/JFR-1510-stg to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc