Eqh 2757

See commit comments