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

* commit '6d42e4134a58f088678af41c70154ecf43df7284':
  Merge pull request #2319 in SMP/jackfruit from feature/JFR-1135-stg to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc