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

* commit 'c84dd47d57e894d86ab5ac478cb00844a59a1a6b':
  Merge pull request #990 in SMP/jackfruit from fixes-2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc