Updates to HI workflow

Bock, Andy requested to merge Bock into master May 11, 2021