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

* commit '1b3ebd306a4ddbf3fed7a27790b1032b80cf7f18':
  Merge pull request #1074 in SMP/jackfruit from feature/SMP-9004-fix2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc