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

* commit 'e1745ca04b43aa2832cae9f13d4e9921450aaacf':
  Merge pull request #2043 in SMP/jackfruit from development to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc