Automatic merge from release/1-staging -> development
Automatic merge from release/1-staging -> development

* commit 'f83c17e9127489c11885060194b36d22cb57ff31':
  Merge pull request #799 in SMP/jackfruit from feature/SMP-8855-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc