refactor: Ensure findById returns null instead of an array when ID is null
#2291
| Job | Run time |
|---|---|
| 3m 18s | |
| 9m 16s | |
| 3m 9s | |
| 4m 3s | |
| 5m 10s | |
| 3m 42s | |
| 4m 18s | |
| 3m 22s | |
| 13m 22s | |
| 2m 50s | |
| 6m 42s | |
| 3m 54s | |
| 3s | |
| 1h 3m 9s |