Modernize htc #8493

Closed belforte closed 2 weeks ago