[TASK] ADWD-1368 reset map only when necessary