Merge "Fix ApiSandbox"