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

* commit '6fbc06a3d9225e7d8585ac7d1f59bfe4378ac09c':
  Merge pull request #2190 in SMP/jackfruit from feature/JFR-1117-fix2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc