HL-495

please review