Manual merge of wbyoung/assign-test-ids.