EQH-2367

See commits.