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

* commit '531cc47866a7abc1f0d116dec6f7c6452bb0d960':
  Merge pull request #1231 in SMP/jackfruit from feature/SMP-9199-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc