HG-838: Interim commit