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

* commit 'd4939be48a7ec3e4ceef3558c873e4f1c4d24ce5':
  Merge pull request #2040 in SMP/jackfruit from feature/JFR-1055 to development

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc