Merge "Add heuristic data race detection to sp<>"