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

* commit '00f2c17651de5e4ab7caf76fddb924eaf72ce321':
  Merge pull request #1445 in SMP/jackfruit from feature/smp-9471-force-optin-for-trial-offers to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc