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

* commit '2a0e47a7c0327e88be73381dd376e0c72f3f7dcf':
  Merge pull request #1747 in SMP/jackfruit from feature/JFR-634-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc