Merged Yang's req->constraint traceability