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

* commit '70f1e19a449c359fe13df3e92082f9cd2866a6c8':
  Merge pull request #2329 in SMP/jackfruit from feature/JFR-1534-fix2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc