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

* commit 'ae140c1da2acbc62fbb5229d1eeb73031651de28':
  Merge pull request #1460 in SMP/jackfruit from feature/smp-9577-trial-offer-status-overwrite to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc