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

* commit '492d4a94a5cd3e8d2f4733e47cd21802458cbf6f':
  Merge pull request #1355 in SMP/jackfruit from feature/smp-9108-increase-lock-time to release/1-staging

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc