Merge "Add tag to sandbox crashes" into tm-dev