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

* commit '75b13538922777ce287dd940ce7749b2673ac569':
  Merge pull request #2032 in SMP/jackfruit from feature/JFR-1043-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc