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

* commit '35ba335caa73ee825c32ffe632bc95ec8a9a197f':
  Merge pull request #2345 in SMP/jackfruit from feature/JFR-1273-2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc