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

* commit 'bcaccd728a53322a0475be4933868166eb0e1149':
  Merge pull request #1556 in SMP/jackfruit from feature/SMP-9700 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc