Merge "Fix some stale dataclass detector false positives"