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

* commit 'a7d7b8dee9079d11490c737f7c47489efe5d1abd':
  Merge pull request #950 in SMP/jackfruit from feature/SMP-8907-fix to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc