Merge "Fix SO restart without test-name"