Fix concurrent map access in Averager and ER drop in stitch_up#4

imallona merged 1 commit into

mainimallona/fastder:mainfrom

devimallona/fastder:devCopy head branch name to clipboard