EQH-2044

See commit log.