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

* commit '9e6de9d1e8004e06893d3566b8923598dea7c99e':
  Merge pull request #1618 in SMP/jackfruit from feature/JFR-483 to release/0-blue

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc