Merge "Fix race in test_crd_check_duplicate"