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

* commit 'e9c10dfc6fa69e804e90ebb1eed184effecb9e09':
  Merge pull request #1292 in SMP/jackfruit from staging-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc