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

* commit 'c8178e89a2a026c78b367627d6d62458f4ee4265':
  Merge pull request #854 in SMP/jackfruit from feature/smp-8602-final-final-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc