Automatic merge from release/2-sandbox -> development
Automatic merge from release/2-sandbox -> development

* commit 'd17368a517dc8c146ed1f7162dff0a4497169a8d':
  Merge pull request #2309 in SMP/jackfruit from feature/JFR-790-default to release/0-blue

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc