fix-sandboxing-mr821
