HVA-6497

reviewer @dosheawork