Eqh 1792

See commit comments.