Dev/backport ead fixes to atom 2 1

Update 2.1 branch to have EAD fixes from 2.2. To help with issue #7443 import (and others).