Refactor - use defaultdict instead of dict

11 jobs for !6211 with issue-1782-storm-protection in 52 minutes and 31 seconds (queued for 5 seconds)
merge request