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

* commit '843ef9ac3ae712fac85782eaaef662a14dc86ef4':
  Merge pull request #1566 in SMP/jackfruit from feature/SMP-9708 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc