Eqh 2760

See commit comments.