Merge "Introduce config for sandboxing" into sc-dev