Modernize htc #8495

Closed belforte closed 2 weeks ago