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

* commit 'ab9b30f8bcb8e72b502a99cc4ab2844c896bc0e8':
  Merge pull request #1888 in SMP/jackfruit from feature/choose-gateway-pick to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc