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

* commit 'b1f7e2b43ecad289b7db4b6c001908ab93e6d3eb':
  Merge pull request #2270 in SMP/jackfruit from feature/JFR-959-v12-updates2 to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc