Eqh 2771

see commit comments