Eqh 2764

See commit comments