Support sandbox mode
Merge branch 'sandbox-mode'

* sandbox-mode:
  Support sandbox mode