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

* commit '36eaaf227f2af6e9ec308e4fdf465e223fb31188':
  Merge pull request #1684 in SMP/jackfruit from feature/JFR-527 to release/0-blue

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc