Merge "Fix ScribeTest." into tm-dev