EQH-2048

See commit comments.