Feature/en 1853

Should it default to sandbox? Match what we did for the .NET version.