Long overdue commit of HlaTools changes